Add 0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch

Fix FTBS on i386 by adding an upstream patch to skip fabs() errno
checking.  Since fabs() has no error conditions, it doesn't guarantee
that it won't clobber errno.

diff --cc debian/.git-dpm
index ad3c367bd190dc516ae0e0e3b55143520edae8ce,0000000000000000000000000000000000000000..62722d384d291f9dd9dc609b69b7ac4c2cfe9614
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- c29cccb1d825523faf484808a699959766d71348
- c29cccb1d825523faf484808a699959766d71348
 +# see git-dpm(1) from git-dpm package
++6ac9d5dbfded9610d8208378a3be49b1ccd8fe9a
++6ac9d5dbfded9610d8208378a3be49b1ccd8fe9a
 +dccb7aff653035782f95e87102338cabcd318122
 +dccb7aff653035782f95e87102338cabcd318122
 +emacs24_24.1+1.orig.tar.bz2
 +2972501e3ab8e7b52e9e476527053b76199f8086
 +25170918

diff --cc debian/patches/0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..362a0c3f2f3bb21ccd34aa62545ac5bf8d17d198
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch
@@@ -1,0 -1,0 +1,47 @@@
++From 6ac9d5dbfded9610d8208378a3be49b1ccd8fe9a Mon Sep 17 00:00:00 2001
++From: Paul Eggert <eggert@cs.ucla.edu>
++Date: Mon, 16 Jul 2012 19:56:00 -0700
++Subject: Don't use IN_FLOAT() when calling fabs() since it may clobber errno.
++
++The emacs build shouldn't fail sometimes with an "Arithmetic error:".
++
++Previously Emacs assumed that fabs() would not modify errno
++unless there was an error, but that isn't guaranteed since fabs()
++has no error conditions.
++
++Origin: upstream, commit: 8e0e7a92f5ae99ce2461fc0f0b606d4cec3efb81
++Added-by: Rob Browning <rlb@defaultvalue.org>
++Provided-By: Paul Eggert  <eggert@cs.ucla.edu>
++Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11913
++---
++ src/ChangeLog  |    6 ++++++
++ src/floatfns.c |    2 +-
++ 2 files changed, 7 insertions(+), 1 deletion(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index 98c4124..32631e7 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -1,3 +1,9 @@
+++2012-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+++
+++     * floatfns.c (Fabs): Do not wrap fabs inside IN_FLOAT (Bug#11913).
+++     Unlike the other wrapped functions, fabs has an unspecified
+++     effect on errno.
+++
++ 2012-06-01  Chong Yidong  <cyd@gnu.org>
++ 
++      * Version 24.1 released.
++diff --git a/src/floatfns.c b/src/floatfns.c
++index 305c78c..fa672c7 100644
++--- a/src/floatfns.c
+++++ b/src/floatfns.c
++@@ -676,7 +676,7 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0,
++   CHECK_NUMBER_OR_FLOAT (arg);
++ 
++   if (FLOATP (arg))
++-    IN_FLOAT (arg = make_float (fabs (XFLOAT_DATA (arg))), "abs", arg);
+++    arg = make_float (fabs (XFLOAT_DATA (arg)));
++   else if (XINT (arg) < 0)
++     XSETINT (arg, - XINT (arg));
++ 

diff --cc debian/patches/series
index ce6a446d56ad0bb37aeccb51908c801df5a25740,0000000000000000000000000000000000000000..2d184b00ca3a7da7f9e7d77cc256d8ec841eb042
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,11 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0008-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
 +0009-Restore-doc-emacs-emacsver.texi.patch
 +0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch
++0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch